#astra fixes