Some updates and fixes (nothing important)