Minor bugs
import changed