A bunch of small fixes related to Mora fetching