More Errors Fixes