Fixed Couple of issues.