Couple fixes

#637

Not positive this was all that was wrong, so not closing issue with it