Polo fix, some minor stuff