Fix zero return imports, and support for result types

Fix zero return imports, and support for result types #503