fix local stuffs