Some fixes. Dancer wont work.