Rev 6.1 fixes