Updates/Fixes as per JIRA