Some fixes and updates