Bottling plant fixes