Minor fixes & cleanup