Fixes and enabling stuff.