Fixed a few more small consistency issues