Fixed project dependencies so rebuild can be done just once