Fixed some fails