Some minor fixes to make the build work more universally