Bug fix and develop builder