Syncing fixes from JP