Some Small Fixes