VID-1739 Fix some spacing issues