Made some pre-release modifications