Placeholder fixes