Minor improvement and fix