more fixes for silly import bugs