Some changes to Smolt infrastructure