Improve placement handling & audio bugfix