Minor changes and fixed a compiler error with the resource holder.