Fixes final