Fix missing import

Fixes #513
Fixes #514
fixes #515