Fixed some repy problems