Yet more fixes for entities, also fixed N_SCFCASH