ticket:1 fixes some imports