Fixing build investigation