Errors Fixes

Fixed Errors