Fixed Views bugs from upgrade in 4.4