Fixes for crawler!