#217 checkbox adjustments.