Fix zombie cleanup
Fix tile layout messages