Revert "Bug Fixes"

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

This reverts commit 566d44e81d6a773f58b7f8b9120b399f114a14f9.