Minor build fix and some cleanup