Part 2.1: Some extended fixes for util-like methods