Fix build

Some small tweaks I've been needing to be able to build the project.