Minor changes. The compiler bug seems to be resolved now so I can continue working on this again :)