Fixes Errors