Merge Bug fixes into master