The first part of your bug has been fixed in revision 1116 of the 0.3.2.2 branch.
The second part of your bug is a duplicate of the bug linked to this one. It will not be in 0.3.2.2 because it's too invasive.
The first part of your bug has been fixed in revision 1116 of the 0.3.2.2 branch.
The second part of your bug is a duplicate of the bug linked to this one. It will not be in 0.3.2.2 because it's too invasive.