Bug fixes

Fixed: http://jira.qalight.com/browse/BUIL-29