Some ViewAdapter fixes