Fixing some errors

Couple errors found in testing