Additional fixes