Some reported issues fixed