Mono Solution Fixes