Fixes for few partial mortalities