Revert "Small stability improvements"

This reverts commit d6a5405cc4ce7da6062836172c6b1a0315ef9a30.
Revert "Small graphics fixes"

This reverts commit c5d873d9a1ca9fd23169000e3c9fb82b4415078f.