Fixes and bumps