Fix a couple other bugs in the Lumina startup routine. Looks like the effects of a bad conflict merge...