* Few fixes