Fixes to the build procedure.