Bugfixes suggested by N. Pozzobon on 17th of July 2014