some more little lens fixes