Minor fixes for Utils file