Some Small Fixes 2