Fixes. Added new checks