Re-add startswith and re-fix endswith