Added few fixes