Fixed few things

Minor changes