SOme Small Fixes