Minor fix on some entities