minor fixes to get everything working together