CHTMRL fixes