Few advice fixes