Build and Fix