Fixes after jeg review