Fix small oversights