Labor shuttle fix and thermite fix from PL