UIButtonX fixes