Removed fixes included in 265 in preparation for new build