small bundle fixes