Util Fix
More code fixes...