Work around annoying auto inserting of auto_complete values, and minor tweaks