Trying to get the build right