#58 PC 4.0.1 Bug Fixes