Minor fixes

Signed-off-by: Santeri Salko <santeri.salko@gmail.com>