Fixes and improvements.
Forgot to stage a file.