Minor: better imports