Re-enable some block active/inactive logging, and add some more