Improvements of feasibility checks