Monstro bugfixes, again...