** Temp Commit: Minor fixes