Made few fixes