Minor copyright-related changes
More build-related fixes