Fix the most broken parts