Fix for issues I created with most recent post.