Some bugfixes

- Contracts helped ;)