Fix Uniform/Affine map generation