* fixed portion of RPI related bugs