Add a build step to deal with spurious compile errors when building from source

Add a build step to deal with spurious compile errors when building from source #994