first batch of changes to get things working (post migration)