initial import fixes