Fixes requested by Salim!3