Fixes to Message/Nag-function