Fixes of checks
ups