Port compilation fixes (1/3)