added/fixed missing imports