Fixing yet again more bugs