Update bundle; Minor fixes