Fixed for various CIMI errors addressed in JIRA 524