Some changes for gcc 4.8!