Fixing merge issues from 2.0.3 changes

Signed-off-by: Nick Ciske <nick@thoughtrefinery.com>