Fixes some issues with the latest addition to Dark/Light