Misc required changes