Fixed Placeholder issues