Fix some buld bugs!