Fixed general issues