Clean up spaces and bump up configtimeout.