Fixed general errors