A few fixes;