Removed more warnings - much focus on const correctness ERT-115