Minor cleanups
I, for one, welcome our new island overlords.
A ton of fixes for the AL2 loader