Fixes for elexis user