Attempt to fix gcc 4.6 compilation issue
Attempt to fix another compilation issue