Update the quick fix with some comment fixes