misc changes to get to work with pagodabox