fixtures + entity fixes