STY: Fixes
FIX: Deprecated fun