Additional fixes for utils.inc