Minor fixes / cleanups