fixes for Bucket 2D. Still seems a long way off.