Fixing some placement issues