Fix issues with binding parameters