->prepare fixes