Few fixes for issues discovered on SLC6