Fixed Few things

Fixed some issues