Fixes to the fill. Works again