dry up EntityItemProperties with macros
fix some warnings