More checkbox fixes