Fixes in Roller