Fixed some bugs in new 'mac'