Uncomment and fix a couple of stuff