Build bugs fixed.