[G02] multiple issues fixed