Some placement fixes