Final changes to checkbox hack