Some tiny bugfixes here or there

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