Further Diesel integration fixes