Miscellaneous corrections

Miscellaneous corrections