[FIX] Fixes after walk-thru