fixing some SO issues
save few fixes
fix 2
fix 3
Final Fix for Contribution Branch Issues