Fix multiple errors