Various fixes ... ops...