Order bottom fixes