Fixed some widget mark-dirty bugs