Introduce release fix

- Fixed release issue.
- Other minor improvements.