Just a few minor changes and fixes (such as ammo_base was calling functions in query proxy.)