Fixes for Lightwell