Changes for compatibility with Chosen v0.9.14