Revert "Revert "Revert "Bug Fixes"""

This reverts commit d9be8a3ab0262d054dd1603bd5f089dd61415d1c.
Revert "Revert "Revert "Revert "Bug Fixes""""

This reverts commit 911a1265418b0f5a6b775c2a235a41fffa932381.