You might want to consider a two bath fixing for both film and paper.

Not only will it give you better fixing but it extends the life of your fixer to.