Fix some issues
Merge branch 'release/v45'