Fixes and bundle updates