Tidying up Instances and fixing the build