Bundle update, minor changes