Added stuff to prevent out of mem for filler.

Needs testing.