2014-12-10 Fixes