Add some buggy features