Fixes for DB Script and Jersey