Vel3dc JIRA Fixes