General fixes for central alignment