Longer timeout on errors
Trim spaces on save