Fixes and updates for all