A bunch of fixes for lorrisomicron