Fix makeLenses