Another set of small bug fixes and improvements

* e2f0354 increases timeout from 20 seconds to 60. Fixes #1815
* 922cca9 and 9178740 are just some code styling fixes.
* 8c9b834 will fix/workaround (closed) issue #1715. At least it will produce a warning and continue, instead of failing.