Changed some names in the FW headers. Changed the way we instantiate the template classes to have them compiled for the types we want. Corrected some compilation errors