Fixed a couple more problems related to Moose >= 2.0900