fixed local issues