Bugfixes

Fixed few bugs in specs