[0.0.4m] Fix some minro crashes