Make stuff more robust