Carl bugfixes

Fixes for #266 and #255