fixes for gcc 4.8.3