Some misc minor changes
fixed commit conflict