[FIX] Post WIP fixes