Updates to fix checkbox on forms