Addin wrapping to make client consoles seem less buggy