Fixing Lukasz's bugs.