Small fixes for demo on postgres