Just small fixes. If I find more before this MR is accepted, I'll just temporarily WIP it and add them on.