Some fixes so that fixed-alignment mode actually works.