Quick import fixes