* Minor fixes