Various Small fixes