Minor fixes, new build