Small changes from Jarius