Adding some missed imports