Small balance and parser fixes