Fix part of the issues in 002940-004000