Fixes more crashes