Several Small Fixes