Small fixes, new build