Minor fixes + changes