[Issue #91] random fixes