Minor compilation fixes