Minor fixes/clean up