Minor compilation fixes. Formatting fixes.