Bugfix/plain couch small fixes