Db update, minor tweaks from FE work