09 fixes for next year