Couple of issues fixed