Fixing a few placement issues