Light fixes

A couple of fixes for a couple of things.