90 fixes

Fixes #449
Part of #438