Basic compilation fixes