Some random minor changes