#593 was fixed by #608
#541 was fixed during unstable refactoring