Commited some fixes for build.