Minor updates to be compatible with lens 4