Fixes for the issue