fixes - nightly 27.10.2014