Fix title requirements, fix recursive issue