Minor changes to BSV syntax