Fixed Some probs