Fix problems left over from earlier fiasco