Fixed few things around