fixes from gynelle