Minor compilation changes.