Error fixes and consistency tweaks