Small Issues fixed