Changes as requested in #1 comment

Two minor fixes.