Round of bug fixes after march25 meeting