Fix general issues