Compilation fixes. Not sure if they're right.