Various Small Fixes