Fixes from SMF
Signed-off-by: Antes <malinbay@gmail.com>