PLA-111 fix some minor edge cases
PLA-111 remove debug artifact