Syncing some quick fixes