Update support library and fix NotNull
?