Minor changes to bobbles builder