Mods to bring server into line with new API