Several small fixes.
Several Small Fixes