Fixes and new Utils