Placement fixes