Fixed placement issues