Small compilation fixes