Fixes for yrpri layout