Small fixes made for bugs found white using pl translation on Sprint 22