Some bugfixes and one temporary change, fault spotted