Minor clean up and fix broken import paths