Fixes requested by Salim!: 2