Various small fixes to Eos and data / cache handler