some fixes for gcc 4.8