Various AMP Server and Client updates