Fixed some issues with button access.