Features with new checks
Fixes