Code: Minor fixes