Fix missing imports etc.