Attempt to correct level saving bugs