Changes for compiling without warnings, and attempts to get raw data view to work properly