Moved fixes back into repo