Fixed some tiny issues due to merge from Perforce
Fix some tiny issues due to merge failure