Added fixes for cornerstone custom branch