Fixes preparation errors