Fix

Fixed type and more imports o_O