Minor changes over last commit