6/21 Patch

Some fixes to bugs introduced in the last update!

Once again, apologies for the giant download size. I'm looking into ways to reduce it.