fix remaining alignment bugs