Minor adjusts in MonkeyPatch