More Fixes in Helper