Import and visibility fixes