Fixes #271
Fixes #270
Fixes #235