More Ajax Fixes