more AVR related fixes