Fixes preparation, debug errors