Some extra changes, nothing too specific