Changes to make this buildable