Fixed baugs.