Fixes

@debloper : Do not merge for time being, I will let you know when all of them which are on list gets done.