Fixing some placement stuffs