Fix Issus #1, #3, #4.