fixes for ng, picture client