Fix general errors