Updates to make building from main makefile work