Changes to compile with avr-g++ 4.5.3