Fixed some buttons not being disabled