Bug Fixes

0351572