Fixes for GF-51642, GF-45970, GF-51652

This PR has fixes for the mentioned bugs.