Combat & crime fixes