Misc Fixes for v5.2.1