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