Some updates for issues