Fixing missing imports