Fixed a few issues caused by State: