Fixed compilation issues for old compilers