some small fixes for other GCC versions