*Minor fixes