Tweaks to finalize schema