Fixes from SMF-Core