Debugger problems/limitations

I've found several limitations on the Crossworks (for ARM) debugger. Is there a fix?

1) Only locals declared before code in the function show in the locals window.

2) Macros with multiple lines in them, mess up the line numbering in dissassembly

Release 2.0.4.2009110400.6059