More crazy changes to get servlet stuff on its way