Making fixes