Fixes #295
Fixes #287
Fixes #294
Fixes #286