Carl bugfixes

Fixes #336, #267  and #261