Fixes and bottle ordering