Small fixes;