bubbleshield fixes, part 2