Small issues fixed