Some fixes for Monty.