more crashing fixes...