minimal changes to make grill/lens work in