Small changes from long time ago