Continue
General fixing of utils code