Some things missing in the last commits