Some more Bug fixes