Of course, some fixes were necessary