Fix fixtures and 5.3 compatibility