Move to utility and bugfixes