Fix intermittent functional test errors