Small improvements on DirtyButton