Various accuracy improvements