Small improvements in code management