Consistency check and fixes

Ensures everything should be smooth when making another pull request