Slight tweaks for fix #106.