Various fixes

Signed-off-by: Levente Kurusa <levex@linux.com>