Base: Fix some buttons not working correctly