WIP-More fixes as we go