Error fixes

Alot