small fixes
msgfix