Misc fixes and ensure RETAIL delete prompt works correctly
Update version number