Fixing build order