Working on fixes with rbmj