CORE-4121: Small size fixes