Fixes and new helper