Fixes couple of issues found after trying new version in live app