Update lost property split due to bad merges, fix warden template