Fixed build handling