Small changes for Mono