Leak and compilation fixes.