Minor changes from Jakub