Updated stuff to work in new AVR-GCC