Fixes from debugging plugin.