Errors Fixes