collapse fixes, mac sync 10/5/2014 2