Fixing Malthes bugs.