Adding more things necessary for the build system