Some of these were not working correctly before Guilherme's patch. Another was broken by it and is fixed in this commit as well.