Better error reporting from JSPs
Move network native queries to XML includes