Fixed few things