Build related fixes