More hasql workarounds