Miscellaneous Small Fixes.