Minor Key and Mouse changes