some fixes for p = 3