Fixes to allow for building in container