* fixed another portion of RPI related bugs