Fixes for Regis