Bug fix on some utilities