Multiple Fixes

Multiple Fixes