Some final checks and fixes for 0.40.01 to ensure the auto-align passes.