Changed build dir and minor build fixes.