Fixes for Bill