Minor changes before a bigger update