Couple fixes

Yet many more are needed.