Fix somebugs