Latest updates and fixes