[FIX] Post WIP Fixes