SOme Fixes