small utils improvements