Fixes to get Fiber tests passing again.