Small fixes before user test