Some startup fixes from aeronatique.