Fix issuses