Tweak fix and remove workaround for checkbox