Fixng somebugs