Some minor fixes, change default collation.