A few fixes here and there.

Signed-off-by: Kwpolska <kwpolska@gmail.com>