Some rebuilder updates.