Fix compilation errors which occured due to the apitrary-orm changes