Minor fixes + clean up