Stuff not included in the last commit