Fixes bugs since Jun.23/2014