Various fixes after running automated tests