Minor fixes / Cleanup