Miscellaneous compilation fixes.