FIX import, minor errors