Changes to get it building properly