Bug Fixes #431 #412 #399