Some bugfixes (PRE-4b)