Fixes for JIRA's NSM-251, NSM-82, NSM-247, NSM-255 and NSM-254