Fixes for older compilers

This branch fixes some issues that have occurred on older compilers (specifically on GCC 4.4).

Merge request reports

Loading