Placeholders fixes