Fixes and refactors for various state section validations