Fixed placement bugs