2014-12-16 Fixes