fixes for 4.8gcc