Fixed various placement bugs (Vanilla-307/274)

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>