Minor fixes;