Fix possible two other issues with not working buttons