Alignment package bug fixes and improvements