Fixed vs 2013 bugs