INT-3338: Polishing, Fixes, Improvements