Fixes for mutual code