minor changes to fit in with new infrastructure