Some BS Fixes