Fixes for couple helpers, test