minor infrastructure updates