Various Issues fixed