Active player fixes, Button fixes