some basket fixes