Fixes based on @redmunds' feedback.