Some more changes to Final.sql