Fixed errors from previous commit and added another useful import.