Deceased: Small update

Minor bug fixes