Minor fixes + cleanups