Fixes on Bill