Minor Aeronaut tweaks