STS-3169 STS-3168 Pushed fixes for both issues.