fixes for latest dev