Temporary fixes to be rolled back