Fixes #239
Fixes #238
Fixes #235