Apply fixes done on 21-02-2014