2014-12-11 Fixes