bundle fixes