More centering fixes