Extra utilities bugfixes