Fixes so that it is actually deployable on other systems