More fixes for build command output