Minor changes to fix small bugs
minor bugs