Some fixes have applied after some unit test have been performed.