[FIX] Fixes after testing