More changes to prepared statements