Miscellaneous Fixes