some fixes with 'here' keyword