Fixed broken/missing imports