Options fixes in core