same fixes as in previous commit for gcc