Fix SHELL_PLUS_PRE_IMPORTS