FIX: Fix warnings
FIX: Fix vol stc warning