Final Bug Fixes for 1.8 Version Change