Fixing AL issues

This isn't automergebale for some reason, but just clobber whatever you've got