Adding a few minor fixes
Adding a few utilities