fix local issues