Two improvements