Fixes for the latest hotfix

There's no static pointer to the target/focus entity anymore, have to go thru another pointer. This is getting awkward for the setting dialog, so I took it out..