Fixed menu adapters
Fixed more bad mouse adapter code