Probably all the fixes for now