initial fixes from 2012