Fixed some failing cases