fix 2 temporary issues with nightly build.
fixes #37, and related to bug 3499