Uncommenting some stuff that should be active by default