E1S7: few bugfixes