fixed compiler errors introduced in previous commit (g++)