FIXED: WAK9+ compatibility fixes
FIXED: history