Mono/Linux friendly changes.