Issue fixes during release