Fixes and updates