Couple of fixes and updates