fixes for building on SLC6