Fixing: import function declarations
moar fixes