Some small fixes

Working towards Mono support => we really need a good syntax editor in Linux and MacOSX.