Final Fixes to utilities