Fix some warnings
Merge branch 'postgres' into simple

Conflicts:
	tests/TestImport.hs