Surviving West: Bug Fixes!

A couple of bug reports has been fixed. Thanks for the reports!