Fixes for gcc 4.8.1 compiler