Some fixes and a checkbox.