Mono fix, autocomplete still has issues