Updated Small Fixes