Small changes to util classes