Small robustness improvements in the code view form