FLUID-5116: A couple of little adjustments for UIOptions. Half way fixing unit tests.