Fixed #609 for warrants, wants, law adding, mob boss agendas and demoting. Fixed #611 for mob boss agendas.
Merge pull request #631 from Bo98/f4-fixes

Additional fixes for #609 and #611