Small manual changes