Fixes on updates and checks