Fix block placement sync
Closes #1334
Closes #1335