Leather fixes (hopefully last of the fixes)