Add some additional fixes