Fixes requested by Salim!