Minor fixes..