Monstro - More fixes..