Some placeholder fixes