Fixes necessary to support new version of avrgcc