Fixes for form checkbox