Some minor tweaks like auto-parents and selections