Fixed misc style changes suggested by Ogrisel