AVR specific changes