New checks and fixes