Minor fixes + new build