fixes for recent changes at github