entity: Small tweaks and push Dominiks work.