Many minor fixes from: Stefano Sabatini <stefasab@gmail.com>.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>