Add stuff accidentally deleted in the last commit