Fixes for updated per