Some status cleanup and alignment cleanup