Fixes from 03-08-2014