Minor utility changes