Fixing up entity to work better when worldless.