Moved to using Hammer v2 + small fixes