Attempt to fix Linux crashes