Database layout: minor fixes.