* dynamic entity fixes