Fixing Issues

Uncommenting needed code.