Added gcc-4.8 fixes for sam2p-0.49.1