Some catch up fixes