Minor fixes

Accidentally commented out some code