Bug fixes from 23.01.2014