ETPP-40 fixes, ETPP-52

Signed-off-by: Marcin Wiatr <mail.wichura@gmail.com>