Fix up compilation with new entity/component system