Some changes to Moose stuff